projects / git-annex.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 64263a8) | patch
Work around git 2.50 bug that caused it to crash when there is a merge conflict with...
authorJoey Hess <joeyh@joeyh.name>
Wed, 25 Jun 2025 17:36:19 +0000 (13:36 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 25 Jun 2025 17:36:23 +0000 (13:36 -0400)
commitfb155b1e3e59cc1f9cf8a4fe7d47cba49d1c81af
treea783d9fdaa58b04985d3e4d4043328829875136dtree | snapshot
parent64263a84102a316c2843196ef31f1956ee939fd2commit | diff
Work around git 2.50 bug that caused it to crash when there is a merge conflict with an unlocked annexed file

This fixes several test suite failures with git 2.50.

See the bug report for the full, gory details.
CHANGELOG diff | blob | history
Database/Keys.hs diff | blob | history
doc/bugs/test_suite_fail_with_git_2.50.mdwn diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.